User login

Nerd Tip of the Month: Mac OS X opendiff command (MergeFiles)

Mac OSX's graphical enhancement of the unix diff command, opendiff (part of the optional free add-on developer tools) can be accessed through terminal like so:

Ebony-697:~/Web Sites Data/LinkLocus/Power2Exchange/css ben$ opendiff style_old.css style_new.css

(You can also grab the files through a graphical interface through [volume]/Developer/Applications/Utilities/FileMerge)

Key, poorly documented commands:

  • Command up-arrow and command down-arrow to go from one difference to the next.
  • Command left-arrow to choose the left-column version and command right-arrow to choose the right-column version.

It's very nice.

Comments

Post new comment

The content of this field is kept private and will not be shown publicly.
  • You may post code using <code>...</code> (generic) or <?php ... ?> (highlighted PHP) tags.
  • You can use Markdown syntax to format and style the text. Also see Markdown Extra for tables, footnotes, and more.
  • Web page addresses and e-mail addresses turn into links automatically.
  • Allowed HTML tags: <a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd> <img> <blockquote> <small> <h2> <h3> <h4> <h5> <h6> <sub> <sup> <p> <br> <strike> <table> <tr> <td> <thead> <th> <tbody> <tt> <output>
  • Lines and paragraphs break automatically.

More information about formatting options

By submitting this form, you accept the Mollom privacy policy.