Permalink
Commits on Sep 21, 2015
  1. Cleanup README

    brunodefraine committed Sep 21, 2015
  2. Merge pull request #1 from apjanke/add-README

    brunodefraine committed Sep 21, 2015
    Add README based on web site
  3. README: add note about 'xcode-select -p'

    Andrew Janke
    Andrew Janke committed Sep 21, 2015
  4. Add README based on existing website

    Andrew Janke
    Andrew Janke committed Sep 21, 2015
Commits on Sep 14, 2015
  1. Use xcode-select -p to find FileMerge

    brunodefraine committed Sep 14, 2015
    Following a suggestion by Andrew Janke
Commits on Aug 13, 2012
Commits on May 22, 2012
Commits on May 21, 2012
Commits on Jul 14, 2011
  1. - Following up on a suggestion by Marijn Vandevoorde to use the merge…

    brunodefraine committed Jul 14, 2011
    …file with fmdiff
    
    - Small fixes and improvements
Commits on Feb 25, 2010
Commits on Mar 6, 2009
  1. fmmerge command

    brunodefraine committed Mar 6, 2009
Commits on Jan 14, 2009
  1. Fix phony target

    brunodefraine committed Jan 14, 2009
Commits on May 19, 2008
  1. - growlnotify support

    brunodefraine committed May 19, 2008
    - extra message for fmresolve
Commits on Dec 6, 2007
  1. Use mktemp instead of tempfile

    brunodefraine committed Dec 6, 2007
    Bug reported by Rick Wayne
Commits on Jan 3, 2007
  1. Destdir

    brunodefraine committed Jan 3, 2007
Commits on Aug 9, 2005
  1. Improvements to script

    brunodefraine committed Aug 9, 2005
Commits on Jun 24, 2005
Commits on Jun 3, 2005
  1. Cleanup of fmresolve

    brunodefraine committed Jun 3, 2005
Commits on Jun 2, 2005
  1. Update Makefile

    brunodefraine committed Jun 2, 2005
  2. adding fmdiff3

    brunodefraine committed Jun 2, 2005
  3. Error output final

    brunodefraine committed Jun 2, 2005
  4. Error output update

    brunodefraine committed Jun 2, 2005
  5. Error output

    brunodefraine committed Jun 2, 2005
  6. Correct exit code

    brunodefraine committed Jun 2, 2005